fs/yaffs2/yaffs_guts.c: Fix GCC 4.6 compile warning (and bug)

Fix:
yaffs_guts.c: In function 'yaffs_GarbageCollectBlock':
yaffs_guts.c:2761:6: warning: variable 'retVal' set but not used
[-Wunused-but-set-variable]

Here GCC actually detected a bug.  The code was always returning OK
instead of the previously set retrun code.  Fix that.

Signed-off-by: Wolfgang Denk <[email protected]>
Cc: William Juul <[email protected]>
Cc: Scott Wood <[email protected]>
Acked-by: William Juul <[email protected]>

diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c
index f0ef8db9ee995c5f8b1729a1601a818e64717025..7390b40e011f85946c27d6d74af4509eb3e256e3 100644 (file)
--- a/fs/yaffs2/yaffs_guts.c
+++ b/fs/yaffs2/yaffs_guts.c
@@ -2976,7 +2976,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
 
        dev->isDoingGC = 0;
 
-       return YAFFS_OK;
+       return retVal;
 }
 
 /* New garbage collector